Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 26 Feb 2012 00:59:52 +0000 (16:59 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 26 Feb 2012 00:59:52 +0000 (16:59 -0800)

Trivial merge